Change in openvpn[master]: OpenSSL 4.0: Make X509 objects const
A message that is not in the archive (sent off-list or not yet received): gerrit.1774974242000.Iea1d13c160599f134587c6f1c2f4a90e7f5e3991@...2715...
plaisthos has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 29 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1596/1
src/openvpn/ssl_openssl.c +9 -6
@@ -1846,7 +1846,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1910,21 +1909,25 @@ } } - xn =X509_get_subject_name (info->x509); + +const X509_NAME *xn =X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take a +* const argument */ /* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +20 -24
109 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
plaisthos has uploaded a new patch set (#2). ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 29 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1596/2
src/openvpn/ssl_openssl.c +9 -6
@@ -1846,7 +1846,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1910,21 +1909,25 @@ } } - xn =X509_get_subject_name (info->x509); + +const X509_NAME *xn =X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take a +* const argument */ /* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +20 -24
109 lines not on this page · raw message
Signature · 11 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991 Gerrit-Change-Number: 1596 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos <[email protected]...> Gerrit-CC: openvpn-devel <[email protected]>
plaisthos has uploaded a new patch set (#3). ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1596/3
src/openvpn/ssl_openssl.c +10 -6
@@ -1846,7 +1846,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1910,21 +1909,26 @@ } } - xn =X509_get_subject_name (info->x509); +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take a, and other +* libraries do not have const arguments, so just ignore +* const here */ +X509_NAME *xn = (X509_NAME *)X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +20 -24
109 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
Patch Set 3: Code-Review-1
(2 comments)
Patchset:
PS3:
Fails on FreeBSD 13, which is OpenSSL 1.1 I think?
File src/openvpn/ssl_openssl.c:
http://gerrit.openvpn.net/c/openvpn/+/1596/comment/d8bde3bf_e9695bb4?usp=email :
PS3, Line 1913: * but not adjusted the other functions to take a, and other
missing word after "a"?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Wed, 01 Apr 2026 10:38:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
Patch Set 3:
(2 comments)
Patchset:
PS3:
Quoted 1 line
Fails on FreeBSD 13, which is OpenSSL 1. […]
Acknowledged
File src/openvpn/ssl_openssl.c:
http://gerrit.openvpn.net/c/openvpn/+/1596/comment/c65d077c_c86b945a?usp=email :
PS3, Line 1913: * but not adjusted the other functions to take a, and other
Quoted 1 line
missing word after "a"?
Acknowledged
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 01 Apr 2026 11:44:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 35 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1596/4
src/openvpn/ssl_openssl.c +10 -6
@@ -1852,7 +1852,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1916,21 +1915,26 @@ } } - xn =X509_get_subject_name (info->x509); +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take const +* arguments, and other libraries do not have const +* arguments, so just ignore const here */ +X509_NAME *xn = (X509_NAME *)X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +25 -24
121 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
Patch Set 4: Code-Review-1
(1 comment)
File src/openvpn/ssl_verify_openssl.c:
http://gerrit.openvpn.net/c/openvpn/+/1596/comment/857f427a_70a62c1a?usp=email :
PS4, Line 496: int i = X509_NAME_get_index_by_NID(x509_name, xt->nid, -1);
This line still fails on OpenSSL 1.1
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Wed, 01 Apr 2026 15:35:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 39 insertions(+), 29 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1596/5
src/openvpn/ssl_openssl.c +10 -6
@@ -1789,7 +1789,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1853,21 +1852,26 @@ } } - xn =X509_get_subject_name (info->x509); +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take const +* arguments, and other libraries do not have const +* arguments, so just ignore const here */ +X509_NAME *xn = (X509_NAME *)X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +29 -23
125 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 5
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
Patch Set 4:
(1 comment)
File src/openvpn/ssl_verify_openssl.c:
http://gerrit.openvpn.net/c/openvpn/+/1596/comment/227f2b0f_d0dcd443?usp=email :
PS4, Line 496: int i = X509_NAME_get_index_by_NID(x509_name, xt->nid, -1);
Quoted 1 line
This line still fails on OpenSSL 1. […]
Acknowledged
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 02 Apr 2026 11:28:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 5
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Thu, 02 Apr 2026 12:09:51 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH v5 1/1 OpenSSL 4.0: Make X509 objects const
In reply to a message not in the archiveFrom: Arne Schwabe <[email protected]...>
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1596
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1596
This mail reflects revision 5 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
src/openvpn/ssl_openssl.c +10 -6
@@ -1789,7 +1789,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1853,21 +1852,26 @@ } } - xn =X509_get_subject_name (info->x509); +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take const +* arguments, and other libraries do not have const +* arguments, so just ignore const here */ +X509_NAME *xn = (X509_NAME *)X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +29 -23
125 lines not on this page · raw message
[Openvpn-devel] [PATCH applied] Re: OpenSSL 4.0: Make X509 objects const
Most of these changes are easy enough (it really needs the comments to explain why the cast :-) )
The second change in ssl_openssl.c looks a bit spurious, but then, not overwriting our initial "xn" in the dup looks like good housekeeping...
- finding useful documentation about the functions involved is hard, though.
Tested by pushing to GHA which builds with all these different library versions...
Your patch has been applied to the master and release/2.7 branch (long-term compat).
commit 9b663a08245d92527059c9681e9d429badd6cdef (master) commit 120bc506b0c61f5353cacbcbdb4a371e0330eeb3 (release/2.7)
Author: Arne Schwabe Date: Thu Apr 2 14:10:49 2026 +0200
OpenSSL 4.0: Make X509 objects const
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1596
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36437.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#6) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1596
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36437.html
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 39 insertions(+), 29 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/1596/6
src/openvpn/ssl_openssl.c +10 -6
@@ -1789,7 +1789,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1853,21 +1852,26 @@ } } - xn =X509_get_subject_name (info->x509); +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take const +* arguments, and other libraries do not have const +* arguments, so just ignore const here */ +X509_NAME *xn = (X509_NAME *)X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +29 -23
125 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 6
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email )
Change subject: OpenSSL 4.0: Make X509 objects const
......................................................................
OpenSSL 4.0: Make X509 objects const
In OpenSSL 4.0 a lot of the APIs have changed to return const objects. Adjust our source code to use const objects as well.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1596
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36437.html
---
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_verify_openssl.c
2 files changed, 39 insertions(+), 29 deletions(-)
src/openvpn/ssl_openssl.c +10 -6
@@ -1789,7 +1789,6 @@STACK_OF (X509_NAME) *cert_names =NULL ;X509_LOOKUP *lookup =NULL ;X509_STORE *store =NULL ; -X509_NAME *xn =NULL ;BIO *in =NULL ;int i, added =0 , prev =0 ;
@@ -1853,21 +1852,26 @@ } } - xn =X509_get_subject_name (info->x509); +/* OpenSSL 4.0 has made X509_get_subject_name return const +* but not adjusted the other functions to take const +* arguments, and other libraries do not have const +* arguments, so just ignore const here */ +X509_NAME *xn = (X509_NAME *)X509_get_subject_name (info->x509);if (!xn) {continue ; } +/* Don't add duplicate CA names */ -if (sk_X509_NAME_find (cert_names, xn) ==-1 ) +if (sk_X509_NAME_find (cert_names, (X509_NAME *)xn) ==-1 ) { - xn =X509_NAME_dup (xn); -if (!xn) +X509_NAME *xn_dup =X509_NAME_dup (xn); +if (!xn_dup) {continue ; } -sk_X509_NAME_push (cert_names, xn); +sk_X509_NAME_push (cert_names, xn_dup); } }
src/openvpn/ssl_verify_openssl.c +29 -23
125 lines not on this page · raw message
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1596?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iea1d13c160599f134587c6f1c2f4a90e7f5e3991
Gerrit-Change-Number: 1596
Gerrit-PatchSet: 6
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>